Merge from trunk.
authorEli Zaretskii <eliz@gnu.org>
Fri, 5 Apr 2013 13:10:57 +0000 (16:10 +0300)
committerEli Zaretskii <eliz@gnu.org>
Fri, 5 Apr 2013 13:10:57 +0000 (16:10 +0300)
commit81cf9e3902e67c5d311eb140d7b8af1f781e0464
tree6fe843e28dec2e943eb4e60379dc915c9bc27f3a
parent3c21d841caf584609fb057d7bd9ef8de740d3d6c
parentb160e147475356b11f0b269ea879f62dfac48b66
Merge from trunk.